Fixed construction syntax inconsistency.
Minor whitespace fixes.
Updated to support teapot 0.6.