More math inlining (#5).