Slight cleanup, also storing results when in eager mode.