AC-7999. Check for a few more error conditions and syntax mixing.