Accept a handful more resharper suggestions. Rebuild solution.