a few more lingering old srclocs
standalone from last commit