Fix post-mortem nits for r173528 & r173549