Move timeout into builders

Operations that have a timeout option now have that available
in their builders.

Resolves #408