Code changes to prep for Map CSS.

Code changes to prepare for being able to use various Map CSS formats.