Minor code cleanups.
Merges with Sound.
Merges with Sound.
Minor code improvements.