More work on dirtying.