Minor cleanup in aica-related source files.