Simplify based on SQL layer changes.
Another example.