Change to distinguish value.
Add strict mode to boolean.
Clean up constants.