srd: Initialise struct members by name. Minor other fixes.