Misc tweaks.
Solution for problem #58.