More contract_double arity/signature bugfixing.