Fixed merge problem.
Removed wrapper type.
Tweaked error message.
Renamed 'simple' lock option to 'crossVersionImplementation'
Removed unused class.