Clean up alert controller stuff a bit.