Alter singleton signature to match interface

(fix strict warning)
Merge pull request #2756 from eileenmcnaughton/patch-1

Alter singleton signature to match interface
fix function signature to match interface & not give warning
fix trailing spaces (whitespace issue)
Merge pull request #2764 from eileenmcnaughton/static_warnings

Static warnings