A benefit of cleaning this up as part of this pull request is that we would no longer need a snapshot with an empty implementation of the once_fns directive. So the whole thing could be merged together.