Since instances are asynchronius now, we cannot
rely on instance feedback (for e.g. fill).

This beautification code has to be rewritten using the model.

Reviewed-by: Kai Koehne