A few minor tweaks to slightly enhance performance

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>