Fix #503: data flow analysis issues