[IM] [OSX] Massaging the code a bit...