Tidying up for 1.0 release push to master.