rmove a number of the null checks