Merge patches for power

This patch attempts to work around a problem where the results for
leakage power were too high for some structures.  The problem is related
to some structures being modeled as a CAM when they should not be.