Turns out I still had some specialization issues to fix. And it's still not quite bug-free...