Split out lightmap code.
Minor renames.