Remove more workarounds for really old compilers