Added thread_local for Now().
Minor tweaks + clang++ support via CPLUSPLUS=clang++ make.