Minor updates. All parameters of an internal function are for internal use only.
Again, magic fixing for previous commit.