Fixed: Simplified preprocessor macro usage a great deal.