That too - but keeping the items that deal with the code with the code seems simplest for most use cases.