#27: Minor rearranging and documentation.