Maps v2 cleanup.

Tested on Gingerbread; appears to work.