Parse ambiguous hash literal / blocks better

All part of getting rubyspec to run...