Bug 1095199 — Standardize callback and cb use.

https://bugzilla.mozilla.org/show_bug.cgi?id=1095199