Updating: tidying up due to reloc support.