Merging nlhepler's changes from the past year.