Replacing 'with' callbacks with 'will' because of HHVM failures (workaround)