Improve the handling for shorthand arrays!