Switched to comment-removing parser instead of explicit check