I think we should be consistent about having each k/v pair on its own line.