Some minor optimizations without changing functionality.
Feel free to cherry pick/discard anything if needed.