Reopening with a new PR after discussing it with Daniel. I think we came up with an acceptable solution.