First part of binary characteristics refactoring.