omr refactor; stream measures bug fix.