Cleanup spike with results from discussion with snusnu

http://irclogger.com/.datamapper/2013-03-22#1363979144