Some cleanup, now that we're starting to have separate handlers.