Fix some escape issues and re-do removal of 'bytes'