Some slight improvements with handling unknown (or no) arguments