Cleaned up call to m4