Brilliant refactor for WhenReadyWrapper pattern