finishing up some replacement of type-name literals with constants