Copy over changes from @MuscleRumble's corner radius pull request.