In order to do a new release, let's fix the one issue we have opened. While at it, clean up the code a bit.