The first one looks like an easy optimisation that I think makes sense, @david and @eviltrout spent time optimising this area so I will be very curious to see what they think about it.
The second feels a bit more fragile long term, totally get the desire to optimise but it worries me a bit cause it will be an area we need to maintain.