More SM tidying.