rref #5046
REFACTOR refactor if else cases to dynamic dispatch to generate fields
rfix #5152
fixes GH-89
fixes zetaops/ulakbusGH-203