Check for the common case first -- code is clearer this way anyway.
Get rid of some jfree code -- I deleted that library.