Reorder a bit in viewport.c so that we don't need stubs for checkwps.