More work on the static analysis phase.