peg: some cleanup.