Stage one of nodeActions cleanup.  Cleaning up wretched indentation in a long method is next.

Leo build: 20140920170225