Enable long lines for this file
Clean up handling of OMP_NUM_THREADS
More debugging macros
Drop -fopenmp in general