Fixed token generation for multiple signatures for addDecl