all: better handling of '-s=...' + better package-use remapping