Misc. tweaks to reduce redundant method calls