Fix generation of simple, primitive properties