Fix configure.ac now AM_CONFIG_HEADER is gone
Make cardinality of result explicit, remove join hacks