legacy/trac#15188 fixed one instance, we should make sure there aren't more. Assignments are clearly bad, function calls are potentially bad. Anything else I'm looking for?