Parse more literals, replace support for filerewriter, some annotation ensure fixes, not yet done