Simplify some end captures
Color self[] brackets as self