Minor cleanup of bouncer handlers.