Add some more refactors. Cycle privacy/collection/keyword->string.