Prepare for StackState improvements.