C-style comments removed (again).
AE stuff got some extra definitions (don't know why these weren't checked in).
3 files changed