fixup configurable version, move def to .cc
fixup generalise journalpointer, ws