Now that I can finally dig into ATN which was languishing with the
other team, cleaning up ATN.