Refactor binary and src/acidity sanely!