refactor($parse): move around previous security changes made to $parse