Implements enhancement #43.