Adjust bundle target and remove nested preprocessor if-else for singlefile build