bug 784224: addressing review comments