We should handle this TODO as part of #707 (fine with a separate PR to this one).