Undid an earlier merge
Took out debugging code
Modified add-psinfo and calls to it to use ps-json computed just once