Some refactoring king-safe
Merge branch 'dev' of https://github.com/pdigre/NorwegianGambit into dev