Parser code fleshed out a little.