Rename alias_for -> alias_for_arg, add alias_for_opt