Revise second pass for new grammar