Issue #474:
- Removed use of missing static function