Code cleanup: #6990 use prototype functions instead of own ones where possible in...