Tidied up some key adapter code in GameBoard,