Import w* functions so that I can send smaller diffs around.(Nothing activated yet, of course)okay deraadt@