Add now-necessary 'statics
Remove many (most?) lifetime variables thanks to elision
Solve a few deprecations