Remove dumb architecture-specific stuff, use stuff available in runtime library instead