Name some constructor closures.
Remove some stray whitespace.