More UIKit cleanups (#478).