expand correct recognition of infix operators
properly end data declarations at any top-level declaration, not just ones with a keyword