(Apple) Cleanups to btpad code