Merge "General cleanup; add support for key-value pairs"