Update ExprField pattern match; fix build