stf [mod] more minor cleanups