Simplify old code a bit.
Keep profile question order correct.