Improve checks for nested creates and updates.

Closes #2194.