Attempt to merge various changes from months ago.