Tiny performance tweaks