Commented out old #defines, documented new ones.