31221: Handle zero defined aliases better