base-ify some more