Module.java - Cleaned up some macros & functions.