Some refactoring and added model checker preferences page extension.