Remove global module id var hacks.

Nothing needs them anymore.