Bug 991153: fix un-qfolded nits from bbouvier's review (r=bbouvier)