Tidy up of code now that "swizzling" is performed on main thread.