Standardize parameter name.
Update TODO.
Static-ify a few constants that should have been static.