Polishing

This change polishes up the code, which for some reason has different
requirements when building for "iOS Device" than when building for the
simulator.