Correct style rules (fixes #3860, fixes #3891)