I'll look into this today. Won't change it for this PR yet, though.