[a4y] Some more code cleanup.