DDBEASY-116 - Refactor status logic.