Make control less ugly. Now it works both for properties and
associations.