Refactor command matching into CommandManager. Parser will just be for interpolation.