Working towards better custom argument handling