Moved map size out of preprocessor definitions.