Tidy up, also fixes g0 usage on RFM69x