Reduce the number of arguments in the instruction builder and make some