Changed indenting to 4-space, to match boost style. Also moved `nil` type to separate file.