Reduce dependences on auto-generated code