Simulation without the Artificial Abort: Simplified Proof and Improved Concrete Security for Waters' IBE Scheme