Cleaned up some standability things wrt to the new trunk pieces.