Minor cleanups to cpname_state This changes cpname_state to have a constructor and some inline initializers.