Issue #311 - Remove more unnecessary whitespace and function prototype style changes.