Finish Instruction and traversal refactoring.