Moved self-assign to statement definitions.