This commit closes bug 7605, and half-closes 7638. The AEL code has been redistribute...