Clean up entry/exit message handling.