WL_DRAW cleanup
Some little namespace cleanup