Hi ),

I split these patches up into more atomic parts, made a few minor 
tweaks I deemed fit, and pushed them to master in two stages as 
4c63796545ce2a1f7cd556a831bb92c7b3166358 et al and 
30edb241a9ba50fefbd08438b5ffba25b10c6e61 et al.

Thanks!

T G-R