images/cel: General cleanup, part 2.