core::rt: Clean up some more hacks