Sorry, I should have paid more attention to what you said. I read your post but didn't really give it much thought but now on rereading it's really quite clear. D'oh. I guess I was so hung up on buildings and the individual factors that "city's unmodified income (or just certain parts of it)" somehow didn't strike me. My bad.
Anyway, I'm still glad we've got the thing figured out.