Make cardinality of result explicit, remove join hacks