EMH: Address @jairideout comments