(Apple) common/main.m - some cleanups