harden method signatures
Merge pull request #3235 from dereuromark/3.0-wip-method-signatures

harden method signatures