Some tidyups to the Objective generator