Cleaned up the ship creation API a bit.