Cleaned up if includes.
Added if expressions (ternary if).
Ensure type of a literal exists. (Possibly a future problem...)