FLOE-194: Renaming and making use of model state values instead of a re-checking.