Fix client and render issues with Arc Lamps. Fixes #726. Fixes #1016.