Improved clarity of expr scanner