More maruku workarounds.