Merge grinder and grinder-generator and add property accessor support