partial rework p4 table build.