Bug 1067744 - Fix build bustage in e8a1c2b11f71, and actually make the monitor re-entrant. r=bustage.