intern derived columns into FROM, ignore WHITESPACE, update spec