slc-base: tidy up