Little cosmetic changes, and some compiler options for optimization.