Having just added handling for channels, I realise that special handling will also be needed for maps and arrays. Need to check handling for all compound types.