Update after the fall out from the syntax::ptr changes