Bug 1032726 part 6 - Some followup changes. r=bz