Including '%' in output var names now, for consistency; some comment cleanup
Fixed function args not being included in reaching defs