SimplePush: Rework and add missing items to further match the SimplePush spec