Started refactoring: use analysis base methods for verification.