Use if-then-else for better-steered parsing

Use if-then-else for better-steered parsing #2920