Analysis: Reverted breaking changes (undone previous fixes which defeat the purpose), fixes regressing issues reported by code analysis (except some), code refactoring and dictionary words added.