Favour Sets over Map.
Merge branch 'master' of https://github.com/stuhacking/Sokoban