[jhc] darcs patch: code cleanups