Clashing inputs for d-pad like inputs aren't handled correctly

[alice-i-cecile]

Broken in #548. This needs a serious rethink / refactor: the way buttonlike / non-buttonlike inputs are handled is quite messy.