Make journal / comment and activity more generic.