@gjtorikian You want to do a PR making those changes?