Fix some inconsistencies between plot(...) and plot(layer(...)). Fixes #336