Bug 838280 - Add function names and comments. r=froydnj.