Cleanup of analog bus map code.