Some minor re-organization to bring the action methods and accessors together.