Cleanup of honestbleeps' dox warning changes.