Partly just to give us an extra commit to test the versioning,
but they really aren't needed in any of those cases, and now
we're consistent about not using them everywhere.