Absolutely final commit, patched to work in jar form.