This also merges several improvements to avoid compiler warnings with GCC 7. FIXME: There seems to be a regression (random crashes) during prefix shutdown, needs further debugging.