Various refactoring/changes/fixes. Mainly in Binaries/Backfill classes.