Remove extra `shift' screwing up argument processing.