Yeah. Also, there are various places where we are using "nw_src" and "nw_dst" to refer to L2 addresses, not L3. (These are called "dl_src, dl_dst" in OpenFlow).