const-ified arguments where possible