codebody rule improvements (?)