Improved drawing boundary behavior.