A bit of code and doc cleaning (minor).