I'd forgotten I used inspect to do that :( I guess we fix #597 first then.