Stricter check in normalize
Use self instead of class name
Ensure ws and en are both not null
Simplify Bounds api
Small CS fix