[PKP bugs] (Partially) clean up after changes to Journal/Context classes