Minor cleanup suggested by @busykai