Removing some more of the with-metas - don't need these if the whole thing is wrapped in prewalk-with-meta