Improved force field parsing for pound-defines
Removed some debug printout