Fixed WB comments, and a leftover which got messed up when squashing.