I actually asked him to make this change. But I agree that we should keep the syntax separate from the other changes. For later PR.