only add valid (actually set) wait status fields
remove unneded complexity from zygotehandler