Move checkpoint timing code lower and only time full database
checkpoints. #1374