Minor cleanup.
Simplify compilation process a little.