Improved inline heuristic: