Improved support for suspended transaction types.

From henriquebastos, thank you!