Improve ARM TC builder