PRD-4841 - Table layouts started failing due to more state errors as

previously underutilized code jumps to life.