Bug 1000100 - Baseline postbarrier tidyup r=jandem