Also includes cosmetic fixes wrt coding-style.