The factory methods for AddPNode should be in AddPNode class. The make_load / make_store methods can be refactored to instead just use the "make" methods from Load/Store classes.