Fixes #322 Instead using the idea suggested, I dropped the patch and reimplemented some of the smol stuff in a new one.