You have it right, as far as I can tell. (I moved to Baltimore in 1967 when Tommy III was mayor.)
I worked for Martin until '67. But I have no memory of Baltimore politics of that era. I must have heard the name of the mayor, but I'm drawing a blank.