monitor: Apply refinement from the Open Vswitch porting.

Signed-off-by: Alex Wang <alexw@nicira.com>