Some minor cleanup and plane enum registration.