Cleanup: filter out empty keybindings earlier

This doesn't make a difference for the behavior, it just looks strange to
include the empty bindings first and then filter them out in the next statement.