Port to new makelib. Rework subvectors.