Made graphics/draw functions currying.
Deleted commented-out dead code.