Slight improvements noticed while reviewing issue #85.