Move signature type checks

Move the point of checking signatures, as suggested by alex in PR 2262.
3 files changed