Bug 1021378 follow-up: take up my debugging stuff, and typos