Small one-liner cleanups.