Issue #44: Fixed static analysis errors.