Fixed ambigous definitions; kuddos to https://class.coursera.org/reactive-001/forum/thread?thread_id=1466.