Replace pseudo-private functions with file-scoped functions
Merge pull request #743 from andre-nunes/issue705

Replace pseudo-private functions with file-scoped functions