Clean up Difficulty code and always display it. Closes #3646.