This PR polishes a bit.

Comment From: snicoll

Thanks again, Johnny. I've split the polish in two as I wanted to back port some of it.