More issues fixed

Fixed issues with strike-from-env. It now works correctly. Issues seem
to be arising from how code is parsed now.