Fix exhaustive expectations not using aliases