fix notice messages on function definition and call
fix notice messages on function definition and call
more static function fixes
formatting fixes
Merge pull request #2018 from dlobo/NoticeFixes

fix notice messages on function definition and call