Added more hipsterish argument handling