Simplify.
Simplify.

This patch partially undoes 32219abfab0bee9bfe064773cc4a9224b951c75f.
That commit was to make the code easier to be handled so that we can
self-compile this file. I noticed that the compiler is now able to
handle the expressions that we avoided at that time.

8l/8cc,cpjreynolds/8cc,andrewchambers/8cc,vastin/8cc,nobody1986/8cc,gergo-/8cc,jtramm/8cc,abc00/8cc,nobody1986/8cc,cpjreynolds/8cc,jtramm/8cc,gergo-/8cc,abc00/8cc,vastin/8cc,rui314/8cc,andrewchambers/8cc,jtramm/8cc,vastin/8cc,rui314/8cc,vastin/8cc,andrewchambers/8cc,cpjreynolds/8cc,8l/8cc,cpjreynolds/8cc,rui314/8cc,rui314/8cc,andrewchambers/8cc,8l/8cc,nobody1986/8cc,jtramm/8cc,abc00/8cc,8l/8cc,nobody1986/8cc,gergo-/8cc,abc00/8cc