Porting fix for AYTF to C++, small comment updates.