More code cleanup suggested by ReSharper.
Add some TODO comments.