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.