Some perf opts in declarative; release 0.4.18