Tweaks from janet.