This is consistent with handling on in-train info displays

This prevents key collisions

Also cleaned up superfluous code

The latter is the official library