Some cleanups and allow "const" in declarators (ignored for now)