Fix #940: Additional pattern-match reverse engineering pattern