Fix up from earlier refactor
Fix up from earlier refactor

openaustralia/morph,otherchirps/morph,openaustralia/morph,openaustralia/morph,openaustralia/morph,openaustralia/morph,openaustralia/morph,otherchirps/morph,openaustralia/morph,otherchirps/morph,otherchirps/morph,otherchirps/morph,otherchirps/morph,otherchirps/morph