Fix for viewable exceptions.
Simplification of constants.