Simplifies complex conditional.
Adds option to run static analysis tests