XFS: Improved CAPTCHA_DIV_PATTERN
+ cosmetics
Merges #578