Comment # 11 on bug 3953 from Ben Rosser

Thanks for the review! I'll fix those issues on import.

Branches requested via pkgdb.