Backed out a code construct that was confusing the IDE.