SHA clean-up and (LP64) tune-up.