Refactored listing of game skills to simplify logic

This is in response to a comment that I left on pull request #952.

Jenkins to come ...