Cleanup: Fix bug where BinaryValue contructor ignored longs