Minor routine tweaking.