terrible hacks to align the state structs

mad props to @eddyb and @huonw for helping me figure this out <3