switch from separate af-...-x/y attrs to combined af-... attrs