Make the logic better, and simpler. override_spec passes. fixes #958.
Merge pull request #959 from afred/double-render-958

Fixes DoubleRenderErrors.