[Azoth OTRoid] Fixed build with GCC 4.7.x + some cosmetic changes.