[1.7.4] Cannot unlock locked categories with Old Psi-Machine

[ScienceBall]

If I'm reading the code right, the Old Psi-Machine in EoR will only teach you talent categories if you don't know them at all (locked or unlocked).

Two possible issues with that:
1) Since it grants you categories as unlocked, it wouldn't be a total waste of the reward if the player chose a locked category (as it would unlock it). So it might make sense to let the player do that and save a category point, even if they might not get as much "value" as learning a totally new category?
2) There's an option to learn "cunning/survival", but every official class except Wanderer starts with Survival either locked or unlocked. So this option is only available for Wanderers. I doubt this is intended, as the Psi-Machine categories were last updated in 1.7.3, whereas Wanderer was added in 1.7.4.