Cleaning up shader-effect-impl in preparation for future fixes

No match.