Small changes before branching for "valid move" checking