Removed pre_entity.hrl include, and fixed warning about unsafe 'Else' variable.
Corrected pre_sim_worker and pre_sim_worker_sup so they compile.