Adds repo arg and cleans up options code.