Cleaned up some hunk related code.