Reintroduce some intialisers that got lost in the merge.