Support space separators for abbreviations as part of #731