One last FixtureA -> FixtureB swap

Should be ready to merge at any time.