Cater updates to the source.
Minor cleanup.