Continued work on switching to Command/Query path.