Two TODO comments taken care of. Nils pointed out that one of them had already been done, and took care of the other one (which hadn't). Submitted by: Nils Larsch Reviewed by: Geoff Thorpe