Remove broken macros
Fix std imports
De-traitify types, fix tests