Merge pull request #2276 from viraptor/move-signature-typecheck

Move signature type checks