Added comment, removed superfluous #define.
More tweaks.