dry up category naming
dry up category naming

also add an indicator whether we are dealing with a file or not to the
current categorization. Currently, of course, file is never unset, but
we're going to use this to denote an inline work-unit

pilif/sacy,fjg/sacy