Add arrow replacements, fix em replacement

Just some replacement cleanups.