Take 2 at a more fleshed out grammar for Dictionary parsing