Avoid double-query on csubs/casubs collections

Fixes issue #371 
I have a feeling a call to subs.clear() is missing here.