Yeah, all that synchronized statement stuff should be moved into the glue layer.  Not in this pull though.