factor out current-puzzle
factor out toggle-light!, toggle-x!