Swift changes

This doesn't need to be a function on the scope, AFAICT.