Re #78: Improve performance