[[ RefactorSyntax ]] tweaks to get things running on android and iOS