Aexpect fixes / cleanup (DRAFT)

Did some simple/basic changes that should fix or at least help us debug some of the aexpect problems we've been having.