"type" is now optional, refs T440