Problem 93 and minor cleanup.