Some small incomplete changes to ModelWalker and Node