I don't think tons of things need to be changed in the C++ (e.g., I'm fine with dx/dk in C++) but the xw/yw vs. width/height distinction seemed like one we might not want considering that width/height is clearer, anyway.  Thanks.