Cleaned up some resharper squigglies.