Yep, definitely agree.  The goal should be to make the shader do no additional work (versus previous releases) when not using the push feature.  We should get as close to this as possible in the CPU code, too.