Some source code improvements.