... and more cleanup of the patch ...