Noted, I'll change it.

See IRC about the 2nd bit.