Fix node.h header guards
Fix old references to 'blocks'
Remove extra space
Combine rup_queue_find_inst and rup_queue_add