Code cleanup: make arguments constant whenever possible.