That's what I'd thought about the class skills, but I've never had to think about it before, so I thought it worth confirming.
I agree that the fluff is, in many cases, too restrictive. Never been a fan of conditional bonuses myself, but this one isn't that conditional, so I may swing with it anyways. Thanks for suggesting an alternative.