Make warnings unambiguous
Use single brackets consistently