Thanks for fixing this. I'd be happy to land a patch of fixes like these and the one below, if you want to do a separate code clean up bug