Small tweaks comma handling in AMhelpers