Continued cleanup of code details.