Yes, this commit doesn't actually change the behaviour (or almost doesn't), just makes things simpler and safer.