Slight cleanup of aliases