Cleaner handling of Condition interface