Inlined/specialised a bunch of shit