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

harden method signatures