modbus extension code cleanup, from smarteh's patch