Switch to GridfieldExtensions by AJShort, minor updates.