Fix up some items that got squashed during merged.
Clean up some whitespace.