More arity fixes for various constructors