Small cleanups pertaining v1.5 introduction.