misc: clean up patch by DevHC, refs #31