Fix new vassal-aware codeMostly hypothetical fixes, but they should still be better thanwhat was beforehand (commit: a2dcc4d)