Small changes to terrain generation using new inline functors. #1