DOL-98 : Dirty check code re-factored.