@Gargron do you plan to revisit this?