Effects Rewrite: Fix style nits