Use updated ImageHandler class API

After talking with @sandal on IRC we revised the API for managing image
handlers. This commit reflects the decisions
in that discussion.