Issue #705 - Replace pseudo-private functions with file-scoped functions

First commit
Merge remote-tracking branch 'upstream/master'
semicolon not needed warning fixed
Merge pull request #715 from ognjenb/master

 Issue #705 Replace pseudo-private functions with file-scoped functions