@pcwalton Tim Kuehn
Fix method names and dynamic borrow check failures
5068422