Property macros in entity declarations, code cleanup