bug 3435: AddReturn overhaul.