1. Make internal functions take const arguments where they should, just