Cleanups while looking at issue #268