ca9afa3293
These aren't stateful functions, so we can make use of const. While we're at, we can resolve some -Wdocumentation warnings.