More tweaks to signature definition.