Minor improvements, nothing user-visible.

Control behavior with flags (that could eventually be passed in as
options).  Fix width="null" height="null" behavior - remove the
attributes instead.  Remove the placeholder class so that it won't get
replaced on subsequent calls (not that this should happen).