Comment code. Fix code to match comments. Perform some code
cleanup. There is some duplicated code in here, but it is small and the
extra work to refactor it probably isn't worth the work or the loss of clairity.