Whitespace and comment fixes.
Adding additional clauses to literal validity test.