Remove incomplete bounds test. Consider stroke width only when active.
Rename shape functions. Shape function coordinate offsets based on actual dimensions.