Clean up argument character checking some.