[Issue #1916] Partial revert of 15515ef, making private functions static again