[1.1.1] optimization pass, simplify constants, style, dead code.

Signed-off-by: Eli Skeggs <skeggse@gmail.com>