Issue #2305105 by aaronbauman: Remove pedantically-deprecated hyphens