Could do, but I'd rather limit this pull to fixing the bug. Also, I don't think it's that good an example.