Fixup from prior patch. Minor reformat.
Easier parse of information - use alists