Starting refactoring to handle multiple synthesized attributes.