definition bodies indented, fixed x-refs