Restricting ability switches to checkpoints is probably a useful constraint for designing the puzzles though.