Bring in line with go.tools revision 153 (147 is last change for ssa).