Improved code style inconsistencies; corrected incorrect test ifdef.