Complete the previous effort to factor out constant expressions

and improve the speed of the if/elif/else blocks.