Updated RapidSMS generic to match master.