Clean up assert hack a little bit.