types: type safer implementation and more accurate inference of return value type for shake

types: type safer implementation and more accurate inference of return value type for shake #510