(Apple) Get rid of some hacks in the frontend code.