Addressed code-analysis errors.