Improve handling of opmock2 stub files.