Move trim_addr_to_width, in prepartion for upcoming commits.