Yep, I'll add the `[]` where appropriate.