I know how I would do it but I'm not going to as I rather busy at the moment to want to focus what little time I have to #951. Crashes are more important than minor build optimisations.