Refactored expr, completed when.