[#858] Stop stomping specific error messages to a more general one in file registration
[#1943] Remove all references to ADDR_64BIT