Move some stuff around to make coffeescript happy