When pushing params, now just keep track of the param declaration context and the reference context, and just change the start search inside the loop, instead of doing two loops.