Made s.goto return a single entity if it's passed in, rather than needlessly wrapping it.
Made some internal functions that used s.goto use s.wrap instead.

This is more semantic and more direct.