Compiler:
 - Account for new argument list