TIMOB-12558 Fix arc-incompatible code made afterwards.

Still see if you can make an ARC-based module.