New settings for installer. New preprocessor rule. A little cleanup.