1.0.18.20: Fewer STYLE-WARNINGs.