Clarify and clean up trait getter / setter generation