rename OswAddress -> OswAddress_t
minor cleanup