Added comments and a proplist-conversion case.