Another attempt at cleaning up primitive property builders.