Mask compile-time shift/reduce conflict due to if statement ambiguity
(cherry picked from commit c4b8be1cb86ba6d169ae97b221d4986f8ecad9a4)