Minor handler restructuring.