Fixed trailing whitespace and added comment.
Added new funcs and updated old ones to use them.
Updated to use new util func.
Converted to LFE.