GEOT-4392, minimal refactor of propertycollectors to fix space issue

GEOT-4392, minimal refactor of propertycollectors to fix space issue