This PR polishes trivial stuff.

Comment From: snicoll

Thanks again @izeye!