minor style fixes + update with recent master (!)

This brings in a whole bunch of noise because of the age of the parent branch, but just focus on ed9cdd8 for reviewing this PR.