Well I finally got some time and made those recommended changes. Praise to the monks who provided efficient and idiomatic code to make AID better. I still have a lot to learn.