Bug 918023 - IonMonkey: Misc cleanups. r=kvijayan