Moved code around a bit to satisfy mozilla/rust@14337

Conflicts:
	argparse/generic.rs
	argparse/mod.rs