Added TODO
Normalize case to a chain of ifs
Normalize code generated by macros