Fix asserts which were broken in bug 946532, which was r=mattwoodrow,dvander btw