General cleanups after video.c changes