Leave intact constructor options + cosmetic changes
Removed orphaned 'FASTEST' #ifdefs emulation