No more architecture dependency, at last.