Change how we declare the various angular pieces so we don't break ngAnnotate