Patches pushed as de444e0294ca3c4186cf9409a6d8a551434083ce and
following. Closing.