[=] small optimisations, v0.0.5