Some cosmetic changes in function / method signatures.