Fix patterns to not match bare @ in comments