VP-211: More UniSub component refactoring. Trying to use free functions more.