Change: Simplify code in AT.