I see this is changed from returning nil by default to `{}`, but there may be formulae that override and end up returning nil anyway. Is that still handled?