See comment on previous file about more convenient return.