Add specific modes for HSUPA and HSPA; add modes for 2G and 3G only, and update plugins to use the right modes.