Removed unneeded forward declarations, added defaulted parameter to private helper function; both suggested by Mario Lang