Fixing subgraphs to work with disabling of callbacks

Hello eford, 

Please review the following commits I made in branch 'jeremy-bugs'.

b297aa8a3ba1f24342ee1d14293d5611efca3fff (2013-01-02 16:14:05 -0800)
Fixing subgraphs to work with disabling of callbacks

R=eford