Make Battery a proper subclass of Area.
Make LauncherIcon a proper subclass of Area.
Make Launcher a proper subclass of Area.
Remove some (now unnecessary) casts.
Another run of astyle.

Need to figure out why it's not working at pre-commit time.