Make integerencoding a completely separate pass... Fix issue of changing ordersets