AAC: Cosmetics after last commit