Clean up variable specs for parser
Merge array and hash specs into literal specs
Merge all string parsing specs together