UIKit cleanups (#478).