Minor cleanups.

Use forward declaration instead of #include when possible. Mark
constructors as explicit. Remove old comments.