Moving the location of stripping out comments due to performance issues when using it after parameters are applied.