Improved language in header comments for -and/-or
Assert wording consistency for -and/-or