Cleaned up code for Editing audio/video. Issue #2037.

Purely code cleanup - no code changes.