I've created #112, I'll fix up a replacement in a separate branch once this is in master to see if I can gain anything. Has no priority.