Whitespace changes.
Build and dependency tweaks.